Close #35, Fix #34