fix bug
Merge remote-tracking branch 'origin/dip' into dip