fixed issue with redundant/clobbering locks