Fixed concurrent access problem