Issue #79, Fix code error