REALLY fixed it this time