fix for #2263
fix for #2261