bug fix 3696
Merge pull request #2957 from cambyse:2.4