Actually Fixed bug 818