Fix assignment bug