Fixed swap issue