fix another threading/locking issue
tagging 20120828