...fixed it for real this time