Fix for encoding issues