Avoids unknown codec errors for #1, still need a real fix.