fixed bug with non-7 digit numbers
some more usefull staff