Fix robot state selector