Fixed the empty problem 2