Fixed the issue where all client sbs were not finishing