Attempt at fixing  #2052
Merge pull request #2053 from Shelob9/2.x

Attempt at fixing  #2052