handle spaces better