#748 Fix bug with spaces