more attempts at fixing the rotation issues