fixing some durability related code