Possible fix for #412