possible fix for bug #1