Assignment table fix