Modifided to posible errors