DAR-3132 fix proposal