[MOD] Fixing "is accesed before computed" problem