Fix for bug #78