Fix bug #86