Trial fix for #2799 - tests fail