Hopefully fix for broken test after last fix.