.......PS. [ZBX-8287] simplified code