I swear it's fixed this time