fixed errors2