To further improve the quality and robustness of the point-spread function (PSF) mapping method for fully automatic and accurate correction of geometric distortions in EPI at ultra high field such as 7Tesla with high fidelity. Conventional gradient-echo EPI and corresponding PSF reference data in phantoms and in in vivo measurements of the human brain were acquired at 7Tesla. To accurately determine and correct geometric distortions, i.e., in peripheral areas, the method calculates the local shift in the distorted phase-encoding dimension instead of the non-distorted spin-wrap encoding dimension. The results of the proposed method are compared with those originally demonstrated (Zaitsev etal. Magn Reson Med (2004) 52:1156-1166). The results show that the proposed method allows measurement and correction of the geometric distortions in EPI with high accuracy, and reduction of residual blurring. In addition, this method prevents errors in the shift map induced by PSF-ghost artifacts. More precise mapping and correction of pixel shifts and blurring is accomplished with the proposed improvements. Errors in the shift map that are caused by PSF-ghost artifacts in the multi-shot PSF acquisition, e.g., from small motion during the reference scan, do not affect the improved shift estimation method.