Fixes Issue #6156