Fixing swapped parameters