fix #109, fix #108

fix #109,
fix #108