Possible fix for #332