Fix SelfAssignment