Fixed the empty problem