diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
index 69f7206af36ec8d2c78ee15ee06ba0f1cb281452..04fb3cc4ee723294ec7b5fd4d8c8b446a6172e72 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
@@ -35,7 +35,7 @@ namespace LOFAR {
 	using GCF::TM::GCFPortInterface;
 	namespace TBB {
 
-static const int DRIVER_VERSION = 238;
+static const int DRIVER_VERSION = 239;
 
 enum BoardStateT {noBoard,
 				  setImage1, image1Set,
diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
index 9f614220c69e0c72fe4a809789278c9f92460e6e..458b66df315a18983b50bcb18fce270224398ea9 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
@@ -352,7 +352,12 @@ GCFEvent::TResult TBBDriver::setup_state(GCFEvent& event, GCFPortInterface& port
 					arp.mode=0; // set arp mode to disabled
 					itsBoard[board].send(arp);
 					itsBoard[board].setTimer(TS->timeout());
-					LOG_INFO_STR("ARP = AUTO is send to port '" << itsBoard[board].getName() << "'");
+					if (arp.mode == 0) {
+					   LOG_INFO_STR("ARP = OFF is send to port '" << itsBoard[board].getName() << "'");
+					}
+					else {
+					   LOG_INFO_STR("ARP = AUTO is send to port '" << itsBoard[board].getName() << "'");
+					}
 					TS->setSetupCmdDone(board, false);
 					continue;
 				}
@@ -504,7 +509,7 @@ GCFEvent::TResult TBBDriver::setup_state(GCFEvent& event, GCFPortInterface& port
 	if (TS->isSetupCmdDone(-1)) {
 		bool allDone = true;
 		for (int board = 0; board < TS->maxBoards(); board++) {
-			if (   (TS->getBoardState(board) > noBoard)
+			if (  (TS->getBoardState(board) > noBoard)
 				&& (TS->getBoardState(board) < boardReady) ) {
 				allDone = false;
 			}
diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
index 8e76fe2fed16dbeb938f0190838dd7beb57f0007..fab92dc8b0e682f3baa7f6da50cd53554d44d593 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
@@ -46,7 +46,7 @@ namespace LOFAR {
 
 GCFTimerPort* itsCmdTimer;
 
-static const int TBBCTL_VERSION = 238;
+static const int TBBCTL_VERSION = 239;
 
 // MAX_N_TBBOARDS and MAX_N_RCUS come from TBB_protocol.ph