- add some debug, and sorry but my emacs ate the evil tabs, I can't split the commit