Trying to fix intermittent test failure