fix datatype attributes expansion