Fix/too much jumping numbers