fixed on more bug