Fix builder
Merge pull request #661 from romainneutron/fix-builder

[3.8] Fix builder