Last fix for SpaceCP