Gahhh! Another attempt to fix numbering