Tweak for auto-numbering