Possible fix for #32