D7 - fixing [#2163013]