Fixed the issue happend after changing system_end_points