Fixed the same bug