Possible fix for #331