fix rotation issues?