Fixed Issue that caused Env Variable to be evaluated once