Fixed Issue #221

Fixes #221
Merge pull request #227 from Lorwp/Space-law-fix

Fixed Issue #221