Fix rotation bugs in 0.23