Fixed some bug that happend