fix the potential bugs....