Fixed some bugs
Fied some bugs