bug fix:
    remove dead loop