Modify builtin.c for github test