FunctionFactory fixed