Fixed compatibility with postal.federation