DAR-1770: fix fix