#42, $39, Fix #27