Quick fix for #31.