Temporary fix for #1336
Merge pull request #518 from romainneutron/fix-1336

Temporary fix for #1336