Fix for space and no suffix provided by Martin Moene