Fix removal of white space after prefix