Issue #409 - fix spaces