Additions to the fix for #1588