dirty push / delete flags are not set/reset correctly