#10 Super minor bug-fix (spaces cause bugs)