maybe fix for #810