r3 - hotfix #1 (StringMap related)