fix same issues