Merge "fix the function pointer table"