Fix null with next
Fix complex null with next