Fixed the bug, new bug