Fixes Issue #7073