Re #7159 Make sure Dq is passed through