This should fix a lock-order-inversion