Fixed new variable check if empty