adds some check for #2706