fix manual assigning