Modification in case there are variable undefined