I think I fixed it this time...