Give more attempts to swap.
Merge branch 'hotfix/v0.2.4-BETA'