fix bug => 0 is not a number
Merge branch 'isAN'