Hopefully fixes some bugs but still loops infinitely