Fix skipNull check