Fix to run with plugin