ALM-420 changed to format required by Addressable