Fix #88 and #93.