Fix #1380, Fix #1381