fix for bug #2