Quick fix for test race