Fix #1393, Fix #1394, Fix #1382