fix #131 fix #132