Attempt to fix bug #3