Updates for Issue #1369 comment #2