Fixed the rollback changes