#3 =1000 bug fix