fixed bug: Non list undefined values not defined properly
...