Issue #3348 fix