bug fix in swap e part selector