fixed first found issues