My idiotic ordering bug fixed