Resolve #88

resolve #88