Fix crash with spaces
Merge branch 'Branch-fix'