Quick fix for #105