fix #15
fix #14