Symbol resolution logic fixed (?)