fix for #2697