Fixed bug #89