Space police, Fixes #6