fix #130
fix #131