Fixed rotation rollover bug