May have actually fixed it this time!