avoid deadlock
Merge pull request #95 from coreos/master

avoid deadlock