For ENG-5962, based in Ning's feedback remove duplicate code, use break