Fix for Issue #4041