fix the original defects, wow~

I want to praize myself. :-)