Update for #2532 after @martijnvg 's review