Fixed a minor problem incurred when merging changes in teh last revision (duplicate memory allocation from Esin's and my own edits)