Another fix and simplification in FlatBoard implementation