[3.8] Fix #1305 : Classic does not work