fixed on more bug.