Improved behavior, but it's still feels flaky.