Fixed rollover glitch