Another potential fix for #229