Fix for Issue #2, assuming missing initial codeset is intentional