Fixed empty? bug