Fixed some wrong