#1703 patch