Fix Issue #721
Merge pull request #868 from Ciziu/floorspace_bugfix

Fixes #721