temp fix for #771