API-2370 correct regression from #15