Fix for PR18921 (LDRD/STRD part)::