Update for #2532 after @kimchy 's review
Update for #2532 after @javanna 's review