d7 1.x - fixing [#2162541]