fixed what I just broke
fixed it for real this time