#1687 fix
Merge pull request #1709 from mesutcelik/fix-1687/3.x-maintenance

#1687 fix