Assignment fix