I think I really fixed it this time