fix swap of two non null cell locations