[bug] - duplicated code

[r-hannuschka]

code factor duplicated code issues