rollover bug fix