Merge branch 'JonasAlfredsson-space_fix'