Invoice number improved