A better fix for #737261