fix #228
fix #227
fix #226