Bug fix for bug #269, 2nd version