fixed a new bugs in new update