Update to 2.5.5 compatibility.

Provided by Werner Gusset.