A little bit better autorotation support