fix some issues

fix #2