[IMP] improved rotation issue