Fix partial swap support