[HELIX-7] fix intermittent failures