Coorect some bugs
Temp