Forgot to add support for spaces