Fix them dynamic endpoints