Fixes #1643
Merge pull request #1652 from Manindra29/findReplaceFix

Fixes #1643