Fixes #3177 Added a space removing modifier