Fix D6 issues

Ideally I think 7 and 8 should be changed as well. However, I've voiced my opinion :)

I've updated the PR per your request.