a few more tests + bug found?