* Fix race condition when performing swap for fallback * Adding a changeset * Use let
Fix race condition when performing swap for fallback