@skirpichev, @smichr, @asmeurer, Are you okay with this modification?