Fix bug #87