Fix for plugin handles not working