fix null comparison