Fixed handling multiple boards