hotfix some bug