Bugfix with replace all
Bugfix with replace all