fix for #2267