SelfAssignment fix