Fix bug #90