Use peco
Fixed a bug