cleanup/fix in material special cases
cleanup/fix in material special cases