Fix #1712, Fix #1709