Swap object fix for vectors