fix: refactor and fix

Pavel Kuzmenko requested to merge kpn/small_fix into master

Merge request reports