possible fix for #4098