diff --git a/schala-lang/language/src/ast/walker.rs b/schala-lang/language/src/ast/walker.rs
index 6298110..df370b9 100644
--- a/schala-lang/language/src/ast/walker.rs
+++ b/schala-lang/language/src/ast/walker.rs
@@ -187,7 +187,23 @@ fn if_expression_body<V: ASTVisitor>(v: &mut V, body: &IfExpressionBody) {
 }
 
 fn condition_arm<V: ASTVisitor>(v: &mut V, arm: &ConditionArm) {
+  use Condition::*;
   v.condition_arm(arm);
+  match arm.condition {
+    Pattern(ref pat) => {
+      v.pattern(pat);
+      walk_pattern(v, pat);
+    },
+    TruncatedOp(ref _binop, ref expr) => {
+      v.expression(expr);
+      expression(v, expr);
+    },
+    Expression(ref expr) => {
+      v.expression(expr);
+      expression(v, expr);
+    },
+    _ => ()
+  }
 }
 
 fn walk_pattern<V: ASTVisitor>(v: &mut V, pat: &Pattern) {