fixed the STORE/swap issue