Attempt to fix bug #153.