Corrected fix for #1703