Merge pull request #438 from s4Ys369/revert-434-patch-1