possible fix for #2656