Fixes regression from #1335