Properly handle spaces