Fix to plugin loader - now it works correctly