Improved rollback check