Leak bug fix, uniqueIdentifierName added