fix for #1731