Bit better rotation handling