Re-fixed rotation bug