Add a workaround for a locking problem.