fixed issues with plugin