Task #59 @1h fix mistakes