fixed:bugs