reset numbers and fix bug