Added check and charset correction