Variation on the fix for #244