Fixing rollback