Fix #1445