fixed looping issue

Pull it NOW