Fixed empty check