HOTFIX: Set right mapping