Possible fix for #333.