Possible fix for #390.