Possible fix for ordering bug