[[ Bug 13913 ]] Actual fix for the bug.
Merge pull request #1481 from runrevsebastien/bugfix-13913

[[ Bug 13913 ]] Actual fix for the bug.