fixed bug with shuttle selector.