Fixed a few issues with the fix for #6410