fixed somecodes