Fix #115, Fix #111, Fix #125