fix #168
fix #167