Additional fix to #4728.