Bug fixes, but plugin still not work :(