diff --git a/ChangeLog b/ChangeLog
index e63cae3..0f0443a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 12:55:41 2009  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/compiler/IRGenerator.java (AddressNode):
+	  always omit Addr for #shouldEvaluatedToAddress node.
+
 Thu May  7 11:06:48 2009  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/compiler/IRGenerator.java (BinaryOpNode):
diff --git a/net/loveruby/cflat/compiler/IRGenerator.java b/net/loveruby/cflat/compiler/IRGenerator.java
index 59c7a7c..63b649c 100644
--- a/net/loveruby/cflat/compiler/IRGenerator.java
+++ b/net/loveruby/cflat/compiler/IRGenerator.java
@@ -650,7 +650,7 @@ class IRGenerator implements ASTVisitor<Void, Expr> {
 
     public Expr visit(AddressNode node) {
         Expr e = transformExpr(node.expr());
-        if (node.expr().shouldEvaluatedToAddress() && (e instanceof Addr)) {
+        if (node.expr().shouldEvaluatedToAddress()) {
             return e;
         }
         else {