fixt more bug