farther fix. Sample 2 may have bug, try to locate