fix to durability
merge