D7 - fix for [#2065073]