Fix #235, Fix #84