Fix #21, Fix #23