fix #253: more COW fixes