potential fix for #1428