CSPACE-6302: Making a tweak to the fix.