fixed id case bug
Merge branch 'dev'