eliminate arbitrary order-dependence for unlovking