Fixed new bug