Finally fixed it right