fix some fail issue