Fix for bug #85