[BUGFIX] Re-add `self` assignments