Fix issue on 2/3/4/6 digit generators