Possible fix for #34