LDT-725: Fixing code duplication