Added rollover check