fixes for rotate device