fix #14
fix #2