bug fix pick next assignment