Fix before locks