fixing new bug