try to fix the new bug..