Floorspace bug
Merge pull request #848 from jhoff/floorspace_fixes_2

Floorspace bug