Additional fix for #1707