Fixed it for real this time