Bug Fix

It is going to replace even the sub-strings, if found