fixed errors3