Quick fix for #83