You know, actually fix stuff this time