temp fix for #577