Fix end to end registration