PIM-1927 : fix attribute types