Issue #466 - fix spaces