Added fix for pseudo empty variables