fix #97
fix #99
fix #109