potential fix for #1292