fixes issue #1940
Merge pull request #1980 from ahmetmircik/fixMaintenance1940

Fixes issue #1940 (maintenance-3.x)