Fix the bug from h***