added replace-all, bugfix