fix for #1693