fixed: swaps