Fix fatal error from #2435