Fix #88 #99