Fix dynamic endpoints