Durability issue fix.