fix resolving ThisExpression