Fix it for real this time