Fix Lightouse 1022
Merge pull request #799 from guillaumebort/LH-1022

Fix Lightouse 1022