possible fix for #394