Really fixed it this time