Possible fix for #301