fixed d1..6 issues