Properly fix rollback