d7 2.x - fixing [#2343871]