Fix function call stuff