Fixes #586
Preserve spaces
Fixes #584