Fixed multiple assignment bug