script fix, plugin merge fix