fixes #2746 in maintenance-3.x
Merge pull request #2928 from mesutcelik/fix/3.2/2746

Data Loss Bugfix in maintenance-3.x