Fix #17, Fix #17