fix for #4547