DAR-1123: Fix regression