Fix #31, Fix #27