Change variabel evaluation to enable none default values