Fixed builtin scope inside builtin functions