more fix on delegations and locks