fix issue 2788
Merge pull request #473 from prclibo:2.4