Fix UnitOfWork