fix for #1920