Fixed the end of the same bug