Attempt to fix bug #8.