Minor update to #4345 fix.