Further rollover glitch fix