Fix issue discussed internally (#2426)