Better fix for #94