Fixed Shuttle Bug