Fix #33, Fix #34