Fix #10, Fix #7