fix #19
fix #11