Fix #86