Mega fix part 2