DAR-1717: Fix after refactoring