fix find and replace #2070