--- 'astro': patch --- Fix race condition when performing swap for fallback