FIxed problem with delays in infrastructure system