further fix for #1407