Slightly altered the rollover detection