Fix #95, Fix #96