fix #29, #27