Spaces fix #2