* fix bug * return if not ok * don't set peer status there * fix build * fix test * fix all other tests * add regression test * cosmetic changes