Another fix for #1703.