fixed issue with class/datatype assignments