fix #131 fix #129