d7 - fixing [#2065073] on 2.x