Attempt to fix bug #1