diff --git a/ethereum.go b/ethereum.go
index 6ace58308..c9da24bcf 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -60,8 +60,8 @@ type Ethereum struct {
 }
 
 func New(caps Caps, usePnp bool) (*Ethereum, error) {
-	//db, err := ethdb.NewLDBDatabase()
-	db, err := ethdb.NewMemDatabase()
+	db, err := ethdb.NewLDBDatabase()
+	//db, err := ethdb.NewMemDatabase()
 	if err != nil {
 		return nil, err
 	}
diff --git a/peer.go b/peer.go
index 5bfec1758..3c36dfc58 100644
--- a/peer.go
+++ b/peer.go
@@ -496,6 +496,8 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
 			}
 		*/
 
+		p.CatchupWithPeer()
+
 		istr = "inbound"
 	} else {
 		p.CatchupWithPeer()