some bug fix
Merge remote-tracking branch 'origin/bugfix'