Fixed bug #77