Fix swap command infered values