fix for #1669