Make the callback in delete conditional
fix merge