Possible fix for #72