Fix for Swap