Prod hotfix org char problem