[3.8] Fix #1445