fixed the new bug