fix the bug reported by Don
Merge remote-tracking branch 'origin/master'