some fixed for concurrent access support