Alternate fix for #437