more fix for rotate