Fix #22, Fix #24 BOOM