Fixed #22 Unassigned logic