Fixed after search and replace