Task #33 @2h fix scripts