Fix #123
fix #125
fix #133