Trying to fix rotation glitch

Change-Id: I8f62044141ed8164d716d569ff6c3be832a5be66