improve RWMutex support