Close #665: Fix alignment of the number of entries