potential fix for #1210