Attempt to fix bug #2