potential fix for #1787