.......PS. [ZBX-8367] code simpifying