Attempt fix with ghost items on swap.