possible fix for #2492