Actually Fixed #2