fix #17
fix #19