Plugin fix