Fixed string.replace issue..