diff --git a/libtestutils/FixedClient.cpp b/libtestutils/FixedClient.cpp
index a58d4ae0e..052141039 100644
--- a/libtestutils/FixedClient.cpp
+++ b/libtestutils/FixedClient.cpp
@@ -25,16 +25,7 @@ using namespace dev;
 using namespace dev::eth;
 using namespace dev::test;
 
-eth::State FixedClient::asOf(BlockNumber _h) const
-{
-	ReadGuard l(x_stateDB);
-	if (_h == PendingBlock || _h == LatestBlock)
-		return m_state;
-	
-	return State(m_state.db(), bc(), bc().numberHash(_h));
-}
-
-eth::State FixedClient::asOf(h256 _h) const
+eth::State FixedClient::asOf(h256 const& _h) const
 {
 	ReadGuard l(x_stateDB);
 	return State(m_state.db(), bc(), _h);
diff --git a/libtestutils/FixedClient.h b/libtestutils/FixedClient.h
index f0a7c54f6..daca444fb 100644
--- a/libtestutils/FixedClient.h
+++ b/libtestutils/FixedClient.h
@@ -43,8 +43,8 @@ public:
 	// stub
 	virtual void flushTransactions() override {}
 	virtual eth::BlockChain const& bc() const override { return m_bc; }
-	virtual eth::State asOf(eth::BlockNumber _h) const override;
-	virtual eth::State asOf(h256 _h) const override;
+	using ClientBase::asOf;
+	virtual eth::State asOf(h256 const& _h) const override;
 	virtual eth::State preMine() const override { ReadGuard l(x_stateDB); return m_state; }
 	virtual eth::State postMine() const override { ReadGuard l(x_stateDB); return m_state; }
 	virtual void prepareForTransaction() override {}