Fixed unicode problem for 2.8 builds