Fix data race on read, not just write