fix for #1268058