fixing issue when content-type has charset