Hopefully actually fixed this time