fix for #3354