end_to_end bug fixed