Replace lock timeout with manual lock