fix #249
fix #250