better unicode source support