Fixes #3109 (closed) and also removes unneeded white-space. See #3105 (closed) for reference if needed.