Diameter bug fix