Spaces fix #4