Really fix it, for really reals this time