providing fix for encoding issues