fixed function arguments, again (they keep getting lost during merge)