An update to the #2639 fix