some more test and a fix