Fixed null in set