Fix unordered access