Fixed getNormalizedIdentifier
Merge branch 'fix-normalized-identifier'