more test and fix