Fix to conform function pointers