fixbug
Remove dependency of plugin