think fixed problems of inconsistency
Merge remote-tracking branch 'remotes/github/bugFixes'