DAR-1859 | fix