Possible fix for #323