potential fix for 1769