fixed #126 and add location in some report