Function object fix