D7 - fixing [#2246737]