I really, really, really (probably) fixed it this time