fix #144
fix #137