Fixed same bug of previous commit