Fixed broken swap ...