fix builtin variables detection