Fix bug when cast 0 counter
Merge branch 'develop'