Fix segfault, season 2