D7 - adding a fix for [#2225723]