Testing fix for #2067