Fixing js encodeing issue: