re-introducing android workaround with zero padded numbers