Fixed rotation bug (and removed work-around)