Fixing issue #543
Merge pull request #833 from andreiarusoaie/unified-builtins2

Fixing issue #543