Fix lock failure on force pushes