another  bugs  fixes