Fix rotation issues with the new feature.