fix errors Ticket#1