Code rollback fixed