Fix for second issue in bug #77