Bug17155

part 2 or 2 fix for #17155...take two