additional fix for #2523