actually fixed ordering bug