fixed errors 1