Fixed WordToken partially