Pull Request: Design_Mohab_fix_zip_error

Scenario: @ahmedhagii @MussabElDash @Mamdou7 @ahmedhagii 
Implementation: @AhmedElassuty @Ahmed-Atef @KhaledHelmy