fixed errors6