maybe fixed endless loop :/