Resolved NULL in some variables