Fix singleton loading
Fix #10 : improved space flights