Fix skipping logic for random assignments