Fix self assignment