Fixed StubDao