fix #244
fix #243