Completly fixed ship swapping... finally