Spaces fix #3