DF-5184 removed draw from material