Almost fixed rotation bug