fix caced bugs