Fix #88 and #90.