Fixed swapped arguments because of a change in Fun.