Added spaces after replaced commands
This is a solution some time but usually it adds an unuseful space.