Hotfix for garbage char issue