Fixed swap of board and index