SA2-417 issue fix.