improve watch lock.