Additions to the fix for #624.