Flaky behavior bug fixed