Quick fix for #608