Be more careful with new status lock /cc @tflink.