Think I finally fixed it