Fix non-unicode extra