Fix #1305 : Classic does not work
Merge pull request #493 from romainneutron/fix-1305

[3.8] Fix #1305 : Classic does not work