resolve #89
resolve #88