fixed pending issues