Workaround encoding issues for now