Fixing assign/unassign