Fixed unassigned bug