Fixed some thing