fixed  bugs