Fixed some values having wrong key
Merge branch 'hotfix/0.41'