fix for #2263