Quick fix for #415