Fixed N_SE-8702(Swap issue)