fixed some bug from last update, but description retrieve issue still
remain, FU_K!!