Fixing Space Station detection