error fix
Merge remote-tracking branch 'my/master'
non-displayer index changed to -1