#1687 fix
Merge pull request #1708 from mesutcelik/fix-1687/3.x-master

#1687 fix