fix PR #1883
Merge pull request #1884 from magopian/fix-pr-1883

Fix the PR #1883 (commit a8a6c63) for bug 986221