Fixed same bug again :/