[#16] Work towards fixing 'out of memory' issue.