Refining previous fix.