Fixed a but with selecting the shuttle type