more attempts to fix flakiness