fixed some bug
last 6 hours