Encoding problems removed (hopefully)