Fixing another regression introduced by a PR causing crashes.