optimize bug display
Merge branch 'tmp'