Refix the empty val problem.