Fix in global modules. Implementation without critical bugs of req 2.2