Fix for new generated-baord after reset or new session