Shift numbering on exceptional case a bit more