Actually Fixed Bugs for real this time