Fixing errors when swapping CF accounts