Merge pull request #4599 from t0mm0/daum_fix