Fix for bug #2