fixing #402 in branch Unified builtins2