Additional fix for #1728.