fix #52 fix #34