Fixed some notations