Catch spaces as well