Fixes #23 - Less aggressive locking