fix #33

Please check if it DTRT.