D7 - fixing [#2171347]