Find/replace bugfix