fix for #2361