Attempt to fix bug #6