Ok, one last fix to correctly set the current ship