Issue #159 - fix spaces