Attempted to fix bug #626.