Fixing encoding issue - 2