DAR-520 | Apply fix