rollback fixing