fix #LOREAL-9412
Merge pull request #136 from tobozo/fix-LOREAL-9412

fix #LOREAL-9412