Quick fix for #79