fixes #2434
Merge pull request #2574 from mesutcelik/fix/3.3/issue2434

fixes #2434