Fixed bug #91