Hotfix/identity not mapped ex

Tested on windows 8 x64 (Norwegian localization) and Windows 7 x64 (English localization).
Branched from the master branch, since unable to build the develop branch.