Temporary fix for #4799
Merge pull request #4802 from LaurentGoderre/fix-4799-temp

Temporary fix for #4799