Fixed ordering bug...