fix for #2316