Quick fix for #93