fix #248
fix #241