Feature/rotatebug