Fix #88