diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
index df0a51889a6..1fbd9b32cb3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
@@ -81,8 +81,8 @@ public class LockBasedStorageManager implements StorageManager {
             synchronized (lock) {
                 _value = value;
                 if (_value == null) {
-                    value = computable.compute();
-                    _value = value;
+                    _value = computable.compute();
+                    value = _value;
                 }
                 return _value;
             }