Possible fix for #74