Fixed bug #85