More aggressive locking